Removed unnecessary datatext modules and fixed a minor issue