remove lazy load thing
code cleanup