Remove a couple of unusefull things