Final Cleanup for branch