Moved all the code from extra-asserts into currently-unused then only adding functions backing when their functionality is required. The aim here is to reduce any redundant code