Removed debug code. Cleaned up imports.