Remove mockup
remove size.rb script
Merge branch 'master' into develop