Cleaned and Deleted some code