Public interface cleanup. Constructor infestation.