Cleaned up files + removed useless code.