Remove old unneeded code