Further project cleanup