Deleted unusable elements, fixed some bugs