Major cleanup

cleanup