(Frontend) Clean up ifdefs