removing enhance part 1
minor fixes
removed deprecated methods
reworking assertion class