Hopefully fix the build.
Need to check for not used imports and extensions next.