More project cleanup