Refactor: Removed useless bits from the extension