#240 Removed some unused code.