Code cleanup

Taken out Key class.