Cleanup packages and comments