Initial add of the deployment contract
Start cleaning up
Additional cleanups, remove of non-relevant stuff