Removed dependencies in Core