:lipstick: Additional Cleanup