Design Text Doc Update and removal of unused classes