Adding workspace, cleaning up the rest