Remove outdate codes, make it clearer, although just a bit..