At least for now.. remove some unneeded lines..