Remove deperecated methods