minor bugfixes
Merge branch 'master' of https://github.com/IoannisCleary/IS3Team.git
removed redundant code