[WIP] Hotfix/remove cp code

Currently this work is still in progress.

I hope to optimize the code base a little more.