Remove query module and condense valid layer methods