Removed bwc logic