Removed first pass code