Removed notification and cleaned up code.