removed a few unused bits