Few more clean/fix to improve the final application size