A bit of garbage clean-up

Removed some unnecessary garbage