Revert "Started Feature [CRP-29]"

This reverts commit 4b71c3daf37a26099c4764ee7f397bdce36d8a5c.