bdb0ba5 Cleanup project