Removed unnecessary methods and update methods