Removed superfluous segments from the sample code we started with