Cleanup for unnecessary code