remove rubbish code :-(