Bug fixes
Bug Fixes
Keys removed