Trimmed out redundant code that was transferred to its own extension