Removed debug output
Fixed str_escape function
Moved uninstall after parameter collection