remove more marker-related code
apply Sirius formatter
Apply Sirius Cleanup