Deleted useless stuff for this branch