Removed debug and cleaned up.