Removed unnecessary holdover code and polished.