Adding some generics and fixing warnings
Removing the now unused post method