Cleanup code (remove comment out line not needed anymore)