Huuge cleanup.
Removing random piecies not used anymore.