Removed un-needed core stuff.