Remove warnings & use framework builtins

Cleaner?