removed redundant class
added assertion for movements directions
fixed concurrent modification exception on death