[CLEANUP] Further code cleanup