Got rid of unnecessary sample code