Cleaned up templates and system properties reference