Remove non-production code