Clean up + dep fix