Start over. Remove everything and add back only what's actually needed.

It's easier than most people think.