Removed not needed params