removing some dead code due to jeads' changes