Cleanup, profiles, block modules and prop-c setup