Remove unused and move methods
Rename method apply_cwt