Removed unused logic and cleaned up child commands

[tophstar]

In the process of documenting the logic I found there was a lot of cleanup potential.