Fixed BKCommonLib classes staying behind on disable, fixed ClassMap bug

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>