#4: Code cleanup in preparation for async implementation

Rex, I hope this is OK: before I start implementing the async feature, I wanted to do some basic code cleanup like remove unused using statements, remove unused parameters and methods, make methods static where possible, remove redundant this., make code formatting consistent, etc. I think a cleanup will make this and future refactorings easier. Please review and let me know if OK. Thanks!