Removed substitution and lifting