cleanup

general cleanup