zeus: remove fillers and clean up