Cleaned up kb listeners