Removed lazy instantiation from code.