Some cleaning. Removed unused parameters.