clean up import
add missing serialVersionUIDs