Removed the dropped limitations