Fixed and removed few things