Some cleanup work on official project.