Stripped a lot of unused code.