Tidy up
*Removed computer class
*Removed unused methods