cleanup
More Genlayer work