[testing, cleanup] Removing commented out code