Removed state logic in prep for loader refactor