Removal of unneeded references, and fixed project