Removed deprecated API

Also removed dependency on com.lyncode.commons-builder.
Added some assertions to untested code.