Removing accidental additions

Moved more than intended from branch.