Dock stripping

For #1253