Removed unnecessary methods and fields