Made some cleanup. Only report project will be here.