Fix project loading
Project cleanup.