Removed unused functionality. Stabilized behaviour of core functionality