Cleaned up files and removed unneeded code