PR Cleaned up unused code
PR/MB/KU [CA-277] Added ability to map data after class has started