Cleanup. Project now warning-free.