Remove unused modules
Add PatternGuards extension