begin to not track client code, remove keyword collisions in a hacky way