Code clean up. Delete unused things