Getting rid of lafs in project setup. Other minor change.