Removed unnessary, old code.