cleanup
disable has_generic check for now
cleanup and some tests