added string concat and some other removal