cleanup

reduced complexity hopefully