Removed future-proofing