Remove incomplete/unneeded stuff