Tapping cleaned up