cleaning up include statements