Removed non-relevant modules
Modifications for Blueprint activation