Added missing function to drop
Refactored code for different steps of imports so each steps independent from each others and commited sequentially - still need to recheck the difference between check and full-check process to correct precisely