Removing more dependencies