remove unneeded stuff!