Huge cleanup..

Signed-off-by: Kitiara <vinas_solamnus1@hotmail.com>