Finishing cleaning up