Removed templating and console