Removed legacy code not useful anymore.