Cleaned up pieces that are computer specific.