continuing cleanup, still not alpha functional