Removed unused using statements and references, reformatted files.