Simplify code that is not used and use live method