Revert "General Improvements"

This reverts commit 680119b877377d868f2eb5961cd6c90cec110809.