Cleans up legacy code...