Removed generated marker and cleaned up code.