Unused includes removed.
Return value corrected.
Return value corrected.