Fix tons of nitpicks, deprecate or delete the unneeded classes