Minor cleanup, removing dead code