Code Cleanup: no need to use old API inside a file that uses new API