Change Maruku check to fully functional mode

this is cleans up the code.