Finalize legacy code removing here