Minor:

- cleanup and convert
remove this premium check since I don't see it set anywhere =P