Fixed computer-specific file imports.
Removed some more computer-specific imports....