Removed some functions we do not use