Trimmed some unneeded code.