Removed some obselete code