remove commented code for a future release