Removed rogue functions which caused errors