Clean up.

Removed unnessecary activities and streamlined intents (sort of).