Remove unecessary method
Fix data not being registered