Fixed broker installation and removed templates