[REMOVE] Some unused code