removed few more hardcoding