Last change to remove conditional compilation