sticky + core cleanup