removed junk code
Merge branch 'Live' into new_design