removed some stuff from core and fixed obsolete