Removing legacy stuff from core