removed unwanted functions and aliases