:fire: Remove needless code and refactor