Term frontend clean up