cleanedup manifest and setup