Removed unwanted parameters