GUAC-932: Finish cleanup and restoration of feature set.

This change finalizes the cleanup process, and restores all features previously present (albeit with bugs, no doubt).