Removed more dead classes and rough in of write API