Comments and deletion of unnecessary stuff