Remove temporarily unused code