some code cleanup, remove js/merge handler as not working for now