Cleanup & Liquify JF Common