Clean up tile layer mechanisms a bit