remove empty fields
add correct maintainer