[REMOVE] some unused code