remove before filters and tenant related code