removing even more code