Commented out development-related code