Cleaned up code, removed unneeded stuff from repository