Cleaned up import stm and removed commented code