Just some cleanup of old unneeded code