Removed unsued elements