Less stuff (24/35)

Less stuff