[cleanup] Removed commented code