Delete commented code
Delete unnecessary includes.
Delete commented code