Removed unnecessary methods
minor edits