cleanup of included files.
cleanup of the controller main code.