removed some code garbage