More cleanup on FEISEM