Remove uneeded stuff