Finished fixing merge errors

Fixed remaining errors after losing git tree
Removed "Unneccessary cast" warnings after updating to latest SDK
Remove unused source files

and added .gitignore to source control