Fixed default parameters.
Removed useless junk