(Frontend) More cleanups