Cleanup & Liquify JF Common Repo