Removed code remnants