Small fixes to remove unneeded stuff