Clean obsoloete code