PRE-FINAL INTERFACE CLEAN-UP +++