Deleted even more code which was not being used