Remove unused key system, etc

Cleaned it up a little bit