Remove some unused/unneeded stuff..