Removed dependency on some older files