Bugs + removed unused files

Signed-off-by: Vallle <seifer_50@hotmail.com>