[WFLY-3324] Ensure the POJO's are removed for custom handlers.