Removed and prep'd code.