Missing classes from last commit, clean up as a target directory got included at some point