Remove unused deps/fields, change main, add keyword