Removed deprecated classes; minor cleanups