Merge "Code cleanup - remove unnecessary commented out code" into klp-wireless-dev