Revert "Revert "Deleted unneccesary things""

This reverts commit 5b2d688dce5da332c288c2d37e6e2422ba2d1142.