hopefully code cleanup is about done for now