remove unneeded code; closes #592