Second batch of rewrites

Amended two classes, deleted an used one, fixed an OAI problem