remove unused include file
remove commented out code