Switching back to role based simple vars + cleanin