Removed some remnants.
Tests still aren't finished.