Removed undecessary code, cleaned up tests and parts of the internal
behavior