Reverted a lot of changes

Signed-off-by: achbed <github@achbed.org>