Pretty much removed most of the warnings - the remaining ones are from
unfinished/unused code