Cleanup

Performed some cleanup and synced to the changes that were made in the
framework.