Card 536 - Clean up in domain space 

Commented out pending up creation and some other domain clean ups