Removing extension dependency