Dschmura front end cleanup