Removed old checks due to CrossFade()'s awesomeness