Removing unused functionality