Removing commented out test code