Removed even more unnecessary methods