Removed leftover obsolete code