Clean up; (+1 squashed commits)

Squashed commits:

[8e8c629] Clean up;