Removing dependency on old file