Removed lot of useless stuff