Remove access to hardcoded data