[#122] Removed some uncessary fields