Revert "New shader system in progress"

This reverts commit 40d8bf8dd37d0c9a5b1512c071163b261f5c57d0.