Revert 78d021e..0017a5e

This rolls back to commit 78d021eab4729bd03ac1e7ab9b23ff133e18cfc1.
Revert "Clear code again"

This reverts commit 0017a5e236b3326587fe65a19d9344e24a2ec2a1.