Removed nerdcommenter and surround