Cleaned up debugging stubs