:recycle: Some clean up