Removed some pre 4.2 legacy code

Also changed shader file names