Finish removing old function