Cleaned up GUI disabled features. Added TODO to comments.