Removed some functions