Work in progress removing project references