Revert "proposal for #611"

This reverts commit 48b2afced8bed54196712fabc8b5705474ba6c71.
remove unneeded declarations