Dependencies Fix && Cleanup