Remove useless designs
Fix minor bugs