Cleaned up and confirmed still compiles with Mono (since most dev happened in VS for the past few days).