Revert "Basic getEvents_internal and TODOs added"

This reverts commit de528b29e4b7ce9c3c815d7a8b2efdeccc6f54c1.