Revert messing around with removing modules, optimized instructions