Simplify pre-user layer code