removed comments and moot conditionals, new workspace dir