more simplification
remove jade