added the clean ups
finished clean ups code is ready for staging