Partials clean up

Cleaned up some unnecessary partials, updated other 'main' files to
match.