domain cleanup and generated views for now