Removed useless code and files