Removed unused method, minor clean up.