removed lazy load
clean up