cleanup of moved out stuff