Last changes for sure ;)

All set with cleanup. Had to change how delete looks.