Removing BC code because turns out it should not be there