Revert "Quality of Life Enhancement 1"

This reverts commit c38b8163d02aaf987fc0be3b2a983043696f1648.