Remove unused commented out code
fix success message