[new_code] Cleaned up more code for the transition to a new code base and feature