Cleaned up some unwanted copied over code...