Fix issues while upcasting, remove un-necessary functions