Beta build, cleaning up