Project cleaned up to a minimum set