commented two unsafe methods. will be removed in future commits
some cleanup