Moved suppression again
More suppression
Final suppression added
Removed unused constant
Minor change
Removed more unused constants
Changing marker_size to match used markers