Revert "Project : Smooth as hell"

This reverts commit 381d42a29e1738add3c30457136457cfbe4bf235.
Revert "Clean up"

This reverts commit fdac2dc5efc24444e7630a9df00483d0775c7138.