Fix buggy animation behavior when a floor is left and then later returned to. Also, delete some dead code (for readability purposes).