removed junit driven checks