clean some things up & api 1.14