#4 Code cleanup. Removed unused usings.