Delete From

The function is not working properly. Also cleaned up a bit.