Cleared unnecessary methods and code