Removed vestigial code