Removed more unnecessary methods