feat: enable more modules and clean up