Code cleanup

If the particle paket stays the same for upcoming 1.8 versions all 1.8
versions should work.