removed unused code and fixed suckerpunch