remove @current for newly implemented feature