removed unused code and merged data