Deleted stuff.
Deleted different stuff
more deletions
Merge branch 'kyle'