Deleted some code that is not used