Fixed fluent hierarchy, removed custom fluents for now