Deleted some functionality to clean up code