removing the stupid double layer of handlers and preparing for paly store deployment