[CLEANUP] Further code-cleanup