I wouldn't even remove anything. personally I would scrap the whole thing and start fresh, ahh organization.

edit: by scrapping i mean within reason of course, im sure there are some things you would rather not have to code again. heh.