Removing more unused functions. Adding solar target to get_blocks and renaming to get_calibl_block