Added assembly plugin and removed some that seemed not needed