Resolved warnings for Xcode5.1 and removed few extra methods.