removed unused fonfaces and minor fixes