Some project cleanup