Clean up

Removed useless things