Remove Logger & Renaming