removed deprecated methods
remove 'false' from fail-fast return statement; #37