Removed some files
Code clean-up