Updating framework & cleaning everything