WIP: Cleaning marker code.