Removed unsed code