Remove legacy code from project