Entity systems refactoring and cleanup