remove dependency on before_* and after_* callbacks