Build 14 (basically a cleanup of unused variables)