Code cleanup - remove unused and commented out