Removing most from dibs template, will add back when things are working