Clean up unused code
Fix warnings / clean stuff up