cleanup
work on related runtime properties passing