Before code deletion
Bugfixes and custom errors removal