Removing unnecessary methods and an import