Some cleanup

Cleaned up all junk