working on cleaning up deployment