Clean up and update for Redmine 2.x