Revert "Cypsis: Fix some issue's 5-7"

This reverts commit ce074f6a2605571535069c4a14838cbf3324186d.