Remove extracted prelude modules
Fix broken tests