Did some cleanup

Cleaned up some code, removed unneeded files