Fixes #490 - clean up normal/debug keys

Cleans up the Debug and normal keys
Makes fly/no clip debug only