minor fixes & removed masony feature form core