Deleted old code, some cleaning