Removed: some unneeded code and files