Cleaned up code

Removed all database references, added new Leash menu,