Removed unwanted functions