ShortCodeController template dependency clean up
organiation template clean up