Clean up uneeded code