cleanup of comments and project specific definitions