Cleanup pojo-support