module cleanup and requirement annotations