Refactory outdated stuff