Removed silly subfunctions