some cleanups and removal of limit. Small cleanups todo;

- Some superflous classes can be removed.
- Code simplifications.