Separate class name from field name with underscore
Remove stray dependencies

I added them for testing and accidentally committed them at some point.