removing static data
saving template logic