cleanup this, take a decision