Cleanup

Cleaning up old code