Remove unneeded code
Minor tweaks