Clean up Frame code