Cleanup (mostly removing IComputerAccess where possible)